Add bucket to debug output
Merge branch 'feature/more_debugging' into develop

* feature/more_debugging:
  Add bucket to debug output