Merge remote-tracking branch 'origin/allow-formatter-customizations'