Hotfix/6.0.4