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