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