Refs #55506 Change-Id: I2b1aff2ae5b1afb3f9517474ee70bf8af26c7dd8 (cherry picked from commit e53b78da)