Merge "Move DataKind outside AccountTypes"