Merge branch 'new/bug11205'