Add reverse functionality for tb->data and data->tb
build
Merge branch 'develop'