Updated Zero extension to master

Change-Id: I2bd4785f60a16d3cea64f603c8029150594c055e