Merge branch 'refs/heads/hotfix#1'