Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'master' into integration