Merge branch 'pb/remote-mirror-config'