Merge branch 'hotfix/gem_to_dev'
change column type to decimal
Merge branch 'hotfix/value_type' into develop