Added html true
Merge branch 'master' into stcs/dev