Merge "Fix handling of relative ISO path on the CLI"