Remove Boolean &&.
Merged from main