Merge "Refinements to new editor. Some types use DataKind for input now"