2 Commits (refactor-rfc-normalize-cpp)