Hotfixes/wednesday august 8th