Merge w/ 3.5 for issue #26587