Merge "Refactor Function into Predicate." into main