rollup merge of #19614: steveklabnik/gh19599
rollup merge of #19614: steveklabnik/gh19599

Fixes #19599

retep998/rand,huonw/rand,waynenilsen/rand,bhickey/rand,achanda/rand,bluss/rand,shepmaster/rand,GrahamDennis/rand,arthurprs/rand,ebfull/rand