Clean merge -> gc7-branch