Merge branch 'new/bug11269' into 3.14.x