[PATCH 0/3] Sync devel/schemata with code