Changing order of some boolean && or || to make it more symmetric, readable.
Authored by: nerius 2023-10-09
Parent: [r1237]
Child: [r1239]
