Merge branch 'new/bug11163' into 3.14.x