Merge branch 'new/bug11221' into 3.14.x