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