Minor changes by TS
Merge origin/master