#9035 + #5936 Rebase

王权利请求将github/fork/kylekatarnls/patch-2合并到master

Created by: kylekatarnls

Rebase the patch branch

合并请求报告