Merge branch 'deployqt4-cmp0080-fix' into release-3.13

Merge-request: !2494