Merge branch 'source_group-tree-files' into release-3.15

Merge-request: !3630