Merge branch 'fix-pr14560' into micro