SI-7132 - don't discard Unit type in interpreter
Merge pull request #2191 from mergeconflict/SI-7132

SI-7132 - don't discard Unit type in interpreter