[PATCH 3/4] override-other: Regular batch of various overrides