[DF-748] Fix Win32 project
Merge remote-tracking branch 'origin/DF-31_Undo_Redo_2' into DF-31_Undo_Redo_2