Generalized the speed-up trick for accessibility
Merge branch 'compat-2.4.0'