Migrate code to use latest schema improvments from T3

---

Migrated from T147 (view on Phabricator)