Merge remote-tracking branch 'origin/new/bug_8623' into new/bug_8623