Merge "Robustify the source zip creation" into main