Closes #21245: merged update from 3.4.