Update 1.5
Merge branch 'hotfix/1.5'