Merge "Fix: ISO build omits long path files" into stable/colorado