Merge "[POLICY] update images and fixes"