Hotfix/6.0.8