Merge pull request #12753 from jrouleau/fix/hibernate-resume-timeout