BZ1077735 - Squashed commits when saving project files
(cherry picked from commit bc0dbd7d5c8c6772db7bed75ce79bd66356482cd)