merge hotfixes