[PATCH] override-a2.txt: rework A2 overrides