Merge branch 'fix-pr14911' into micro