Hotfix 7 dev merge