Merge from upstream and Bump version to 3.6.5

Xueyuan Linrequested to merge
merge-upstream into master

TBD Merge changes to 3.6.5

由 Xueyuan Lin 编辑于

合并请求报告