Merge branch 'ts_dist' into DigitizerTests
removed redundant flag
Merge branch 'DigitizerTests' into ts_dist