3.1 Html fixes #2316 #2323
Merge pull request #2372 from 810/feature-hmvc

3.1 Html fixes #2316 #2323