Merge branch 'upstream' into bug/init