[imp] [33882 & 33883] W3C Validation. Closes #3804, Closes #3805