AMENDED AND RESTATED MASTER SERVICES AND NON-DISCLOSURE AGREEMENT