Initial attempt to merge with 3.8.0.  Needs extensive testing.