Merge branch 'master' into dpie-merge