Merge remote-tracking branch 'origin/poonam-edits'
Further fixes
property number field should be blank when 0
Merge remote-tracking branch 'origin/master' into poonam-edits