005a78bd83
A small number of types need to be adjusted. The changes seem to be backwards compatible with TS 2.4. PR Close #19966