Closes #18627: merge from 3.3