Changing get data method
Merge commit '922ec1c3a468dcb5e6ffba85ca3d1110ea6ede89' into develop