Hg 69 use one api

Already code reviewed but the target branch wasn't master.