CORE-4796: refactored the conversion for null default values for hidden properties