Merge "Implement addCountAnd{Drop|Pass}IfR0Is{OneOf|NoneOf}() methods" into main