Merge "Make addCountAnd{Pass|Drop}IfR0Is{One|None}Of() support non empty set" into main