Hotfix/2.x updates