tried to add schema
pre-merge
Merge branch 'master' into memleak