gemfile fix
Merge branch 'hotfix/gem_fix' into develop
Merge branch 'release/hgem_fix'