Merge "fixed bug with sd integrator and OpenMP threading" into release-4-6