Fixed schema error
Merge branch 'dev' into ms