(QENG-1033) combine two conditionals into a single statement