Merge "Revert^2 "Code refactoring: Move doRename out of preparePackageLI"" into main