ziguiw-common commit