Merge branch 'qnx_fix' into release-3.12

Merge-request: !2205