commits 6001-6525 inclusive from 2.X applied to 3.0