Merge "Fix crash in a11y cache" into oc-dev