Refs #70084 Change-Id: If635035aea8cd47c52396cdb62511b3507f428f8 (cherry picked from commit 9bfe1313)