Merge branch 'vs-spectre-off' into release-3.15

Merge-request: !3629