[FIX] bring back changes from h2's develop that were lost due to merge from seqan's develop