Merge "Fix preupload warnings" into main