a8f3f70789
* Update type and frame construction
* Update tests
* Keep dataField name as value
(cherry picked from commit 06509712ec)