Fix crash on callables for some branches / configurations.
Merge branch 'master' into luna
Add table schema.