merge satya-164-dev to dev
Data folder renamed to test folder