Merge branch 'formatter-engine-refactoring'