Hotfix/0.19.0.9