Merge "Reduce unnecessary overhead of always-true predicate lambda" into main