Merge commit 'rob/config-refactor' into experimental