Merge branch 'fc/remote-hg'