use forked s2-common repo