Merge branch 'kb/config-unmap-before-renaming' into maint