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