Backport of manual changes

- manual changes made on production schemas