Cherry-pick "change Tags type to Object instead of Flattened ..." into release/0.7

This brings in a patch for the release, corresponding to !119 (merged).