Merge branch 'fc/remote-hg' into next