Merge "[POLICY] new image versions"