CSPACE-6259: Really add metadata, omitted from previous commit.