Merge "Change | to || for booleans" into main