Backport of production schemas

- production changes