fix compile error in ts
Merge remote-tracking branch 'origin/master'