LPS-51580

Think we should be doing the same thing for other primitive datatypes?