Merge branch 'rework-config' into core