Merge branch 'integration'
Fix deployment issues
Added user image
Merge branch 'hotfix/fix_deployment'