Merge branch 'hotfix/2.6.1'
Merge remote-tracking branch 'origin' into develop