Merge "[Dev option] Use static cache for overrides." into main