Partial fix for #14037 Triplicate warnings for same issue (comparison with bool)

Partial fix for #14037 Triplicate warnings for same issue (comparison with bool) #16532