Patch-5.1-hotfixes