Fixed issue with dynamic settings not reloading
Merge remote-tracking branch 'origin/next' into emk_wip