Merge branch 'new/bug11240'