Merge branch 'doc-if-legacy' into release-3.14

Merge-request: !2950