Re #1580 Implementation of the OOC-NC in corelib and schema changes