trying to add resolve workspace
Merge branch 'hotfix'

Merging with hotfix