Cherry-pick "change Tags type to Object instead of Flattened ..." into release/0.7 See merge request !120