DO NOT MERGE - for feedback only

TMS (joint with conan)
Metadata
Traits
Annotations