Merge branch 'new/bug10671'