Merge 3.6.0 release engineering head