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

[TIMOB-18214] (3_5_X) Checks for additional scalar types