Updated Zero extension

Change-Id: Ia84cbb39f77c8002f7bc4d4f7397670d0a2ee5d8