DF-4001: Fixed compilation issue for Win32
Merge branch 'development' into water