schema updates e76
Merge branch 'dev'