Merge branch 'new/bug11185' into 3.14.x