EXM-30807: Accessibility enhancement.