Merge branch 'swift-rpath' into release-3.16

Merge-request: !3965