Merge branch 'release/1.1_39' into development
Add screenshots tests for promo
Fix project file for test target
Project file clean up
Clean up tests
Update build to 40
Merge branch 'release/1.1_40'