Finishing TS-001 to TS-004
Merge remote-tracking branch 'origin/master'