merge hotfix back to devel