Merge branch 'develop' into fix/formatter-ignore-html-chars