Merge remote branch 'origin/new/bug_8770'