Merge branch 'rr/remote-branch-config-refresh'