Update shared adapter specs to include changes from master