Merge branch 'new/bug11196' into 3.14.x