Merge "Fix broken a11y function"