No need for materializers.
2.10 compatibiliy.
Fixing the build.
Data field renamed to avoid collisions.
Merge branch 'master' into join