Merge changes from topics "data_retry", "setup_data"

* changes:
  Added data retry support
  Added setup/tear down data support