merged latest changes from current bug946042-SIMD branch