Merge pull request #16668 from briansull/simd-ins-opt