Merge branch 'rt/commit-cleanup-config' into next