7-12 hotfix2 dev