Merge branch 'fix-pr12554' into branch-1.13.2