Forward port of issue #40568 to 3.3.x.

Comment From: wilkinsona

On hold for now in case we need a 3.3.0-RC2 that we may want to release from Concourse.