Merge with 3.6