Merge pull request #12158 from agileware/Accessibility-Issue-4