Merge branch 'new/bug11159' into 3.14.x