Refs #69037 Change-Id: I028a0e808f3a8c75cc8c6a9727717d9b9b15eb84 (cherry picked from commit 7771a1cb)