Merge 3.6.0 release into default