Make state resolution more resistant and some sync performance improvements See merge request famedly/conduit!490