Refs #72274 (cherry picked from commit fbf9f5e2) Change-Id: Ib97d53f0134697a9c83b64c96c5dd2deb79bdf30