HTML renderer header need to be use Width
Merge branch 'r2.3.1' into develop