Refs #72274 (cherry picked from commit 4d0f52ae) Change-Id: I0f96457d5597e060dd0d6bbe94c735b919f3c3e9