Adding guard for a undefined valueType case
Merging origin/dval/master-pending-valueType-fix into master