Merge "Do not expect 0 or 1 only when comparing a boolean." into mnc-dev