Merge "BUG-869: added proper handling of nullable parameter"