Merge "[POLICY] Release Policy-clamp 6.1.1"