merged with hotfix