Refs #69174

(cherry picked from master, commit e0284a70)

Change-Id: I4332aa7f3b66b8dbae156ed2f4dc9f9f98ab2a4e