Merge branch 'hotfix/2.2.4'
Bugfix
Merge branch 'hotfix/2.2.5' into develop