trim html support
Merge branch 'handle-html-group-trim-description' into dev