Refs #71918 (cherry picked from commit c07bb6bd) Change-Id: I34aa7f0156559a332d648acbe5e8ee548bf04b1f