Merged onto mainline