hotfixes
merge master hotfixes