merge hotfix into dev