no more conflicts
Merged with hotfix branch