Merge "Move overrides to proper place" into stable/rocky