Bugfix/issues after upgrade

Merged tomalo.stuttgart requested to merge bugfix/issues-after-upgrade into develop Dec 19, 2019