Merge branch 'fc/remote-hg' (early part)