Backport additional types VALUEPAIR union types 'byte' and 'short'