Initial refactoring merge

No match.