Merge in changes from trunk which remove a type cast.
Authored by: david_costanzo 2019-06-03
Parent: [r4952]
Child: [r4954]