Closes #18541: merged update from 3.3.