fix: support for dataReturnType data
#747
+252
−243
Merged
data
#747