LPS-35605 added type conversion to Date for ExpandValue