DHB improvements, possible bug #472

Closed
muellerr wants to merge 5 commits from eive:mueller/dhb-bugfixes-improvements into development

5 Commits