Merge branch 'hotfix/5.0.1'
More bugs relating to 5.0.1
Merge branch 'hotfix/5.0.2' into devel