Merge branch 'bugfix/kroeg' into 'develop'