Updated 2.7.5 to match 3.X