CSPACE-6259: More metadata updates.