30-11 hotfix dev