Refs #71871 (cherry picked from commit 81455565) Change-Id: If07525dfd2096c77ae084dfbb4621c646f1ab732