Merge branch 'formatter-html-safe' into 'develop'