Merge remote-tracking branch 'origin/master' into new/bug_6679