another bug 2
Merge branch 'hotfix/2.2'