Forward port of issue #37308 to 3.1.x.
Comment From: wilkinsona
Closed by 7754dd290a38036414f597175272614b2308e357.