Fixes #JOINDIN-502
Merge branch 'heiglandreas-hotfix/JOINDIN-502'