Merge branch 'hotfix/v0.921' into develop
Fixed stupid decimal sql problem
Merge branch 'release/v0.923'