[TIMOB-18214] Checks for additional scalar types
Merge pull request #6497 from vishalduggal/timob-18214

[TIMOB-18214] Checks for additional scalar types