Closes #18604: Merge with 3.4