latest fixes for 1.15 Beta - please help testing