Merge branch 'fc/remote-hg-shared-setup'