Changes that should still go into seqanLast branch