Merge branch 'new/bug10670' into 3.14.x