Merge branch 'new/bug11137'