Close 4.8-solutioncleanup-wip branch