Merge branch 'doc-policy-OLD-deprecated' into release