Validate TS008 and Unit tests
Merge remote-tracking branch 'origin/TS008'