merged new feature with hotfix