Merge branch 'fc/remote-hg-fixup-url' into next