New hotfixes for 6.5.9