Merging upstream, includes common sio mule driver merge.