Use separate callback for applying settings in UI
Merge branch 'master' into builds
7.654