Merge "Rename boolean flow operators to match collections" into main