Merge branch 'vs-flag-map-Qspectre' into release-3.13

Merge-request: !2462