Merge branch 'findjni-paths' into release-3.14

Merge-request: !3042