fix compile warning
Fix jsdoc issue
Merge remote-tracking branch 'Raymond/fix-compile-warning' into 6.5