Criterion 508 changes

PR without W3C changes