Merge branch 'fileapi-CMP0037-OLD' into release-3.15

Merge-request: !3760