Merge "Move {add,remove}{Condition,Filter} to common interface" into main