Merge remote-tracking branch 'origin/development-qa' into DAVA_development. Win32 fixes.