Merging 3.7