Forward port of issue #37309 to 3.2.x.
Comment From: wilkinsona
Closed by 0242ba8a13743993b03bb3581633d65ff9b41c93.