[PATCH] override-{a1,other}: Regular batch of various overrides