Merge "Use a single combine function to combine all boolean flows instead of nested combines" into main