Merged cleanup -> gc7-branch