TS-1820 Fix FALSE and TRUE usage