Properly send up nil fields when set
Merge branch 'b/set-field-nil' into development