schema is modified
Merge remote-tracking branch 'origin/development' into from_june_12