Introduced config.extraAllowedContent.
Merge branch 't/10008' into major