Sync with 19f1d74.
Sync 922086c.
Merge branch '3.7'