Merge release 3.7.0.2 into 3.7.x branch.