Updated to the latest Zero ext

Change-Id: I744723d0688d859569442fb5cb72914ec9acfaec