#1036 Correct Accessibility issues from WAVE tools

Merge from 5.7