7-12 hotfix dev