Add predicate lambda support
Fix formatted slot isssues
3.21.0 update