Fixed adding quotes to null values
Merge branch 'hotfix' into staging