Refs #26536. Thanks Sylvain Fankhauser for the very detailed report. Backport of 207c5b4a from master