AMENDED AND RESTATED MASTER SUPPLY AGREEMENT