Merge branch 'fileapi-file-sets-base-dirs-relative' into release-3.26

Merge-request: !8977