Merge pull request #5636 from BrzVlad/fix-xmm-scan