Hotfix/6.0.2