Add Boolean condition.
Add Boolean operators.
Merge remote-tracking branch 'origin/develop' into develop