Merge branch 'fix-pr13588-pax-hangs' into branch-1.13.2