Merge branch 'upstream' into topic/asoc