Merge remote-tracking branch 'origin/new/bug_8382'