Add/Remove toBoolean
Merge remote-tracking branch 'origin/dev' into dev
Fix issue with toBoolean.