Fix regression with non-aggregate annotations
Tests for custom sql functions
Change arguments name to expressions
Fix documentation related to expression refactor
fix regressions when renaming template params