Cleanup.
Merge branch '3.7' into 4.0
Cleanup.