ZEN-10924

Python logical expressions are lazy, so this two lines can be on one line