Merge branch 'master' into bug_928366