Merge branch 'sg/config-name-only'