Update schema to latest upstream develop