Merge branch 'new/bug8854'