V7 hotfixes