Forward port of issue #41605 to 3.4.x.

Comment From: izeye

This seems to belong to 3.4.0-M2 milestone, not 3.3.3 milestone.

Comment From: wilkinsona

Thanks, @izeye.