Merge branch 'new/bug8854' into 3.14.x