AMENDED AND RESTATED JOINT DEVELOPMENT AND SUPPLY AGREEMENT