1st pass of 3.7.0 merge