Merge "Fix incorrect usage of bool"