Merge branch 'bw/remote-rename-update-config'