Removed debuggin which caused internal errors
Merge branch 'develop' into release/1.7

* develop:
  Removed debuggin which caused internal errors