Merge branch 'modules-restore-path-suffixes' into release-3.11

Merge-request: !1802