Pull in the non-code AVX branch changes that are not related to the AVX implementation itself (Sarah, one day)
Pull in the non-code AVX branch changes that are not related to the AVX implementation itself (Sarah, one day)