another bug 6
Merge branch 'hotfix/2.5'