Fix HTML5 validation error.
Merge branch 'base' into build

* base:
  Fix HTML5 validation error.
Fix html5 validation errors