Merge branch 'hotfix/3.6.1'