Updated Zero extension to master

Change-Id: I455ffe442958ed99ef919c9c4f09045d98830786