Stuff seeing "0" initial value as null fixed
Merge branch 'master' into ritesh