Updated Zero extension to master

Change-Id: I9c86974aebc9092ea4a5fd5d6be606191e762cf1