Merge with updated Nullable

--HG--
extra : amend_source : d830fe46059c5e5b1f0a7872686561b1454edc31
Merge