Finish Hotfix-0.11.1