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