Merge "Misc fixes to UploadSourceField"