[384] Pull schema changes onto master branch.