Merge "Remove IFace#reset" into sc-dev