Merge "Match attributes to actions for pip a11y" into oc-dev