Shorten if notations so that property order can be applied
Shorten if notations so that property order can be applied

BS5 commits: f54b83073dd1bef471ddb2a4052307befd8ee065

todc/todc-bootstrap,todc/todc-bootstrap,todc/todc-bootstrap