o.c.dal2: Fixed simple type mapping for empty results
Merge remote-tracking branch 'origin/dal2' into dal2