Merge branch 'new/bug11163'