rework support for empty geschaeftsbereich
Merge commit 'github/testing' into beta