Merge pull request #16853 from colemanw/bool3