Code before starting today work.
code for qazi
Merge branch 'feature/debug' into develop

* feature/debug:
  code for qazi
  Code before starting today work.