Merges in 3.7 code