Merge branch 'hotfix/updates'
Update
Merge branch 'hotfix/gemfile' into develop