Pull in refactoring.
Pull in formatting and refactoring.
Merge branch 'master' into profiling

o get refactoring changes