Closes #23730: merge with 3.4