Fixed post build settings
Merge branch 'master' into rotation