Merge branch 'new/bug10671' into 3.14.x