Updated Zero extension to master

Change-Id: If0e3c760fc6cd2ec00fa764adb7f07a376e9672d