Finish hotfix-7