[BUGFIX] Problem with null value being sent as string 'null' from mobile client side
Fix conflict