Update project settings
Merge branch 'master' into adc