Forward port of issue #18215 to 2.2.7.