Merge branch 'bugfix/html-scrub-schemes' into 'develop'