Merge branch 'backport-4.2-fix-cmp194-policy-warning'