Merge branch 'fix-pr13514' into branch-1.13.2