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