Hotfix/lms a11y

Retargeting #1131 to hotfix branch