Closes #14158: merged test file resilience fix from 3.2.