@coenjacobs do we need to do something about this for .14? Will leave for you next week :)
Moves settings together. Fixes #3497