change decimal field to null
Merge branch 'develop'