Change simple_tc enabled type from integer to boolean
Merge remote-tracking branch 'upstream/master'