Merge "[POLICY] Update core images/config for RC istanbul"