Merge branch 'ik/userdiff-html-h-element-fix'