sync from clockfly/gearpump