Merge remote-tracking branch 'DAVA/development' into feature-new-materials. Changes related to Win32.