Merge 3.6.0a2 releasing branch into default