Merge "Fix implicit conversion to bool"