Bugfix
Merge branch 'hotfix/2.2.5'