Removed block_sequence_id. Closes #1949.
Merge branch 'sam_alt' into next
Merge branch 'next' into sam_alt_assert
Merge branch 'sam_alt_assert' into next
Merge branch 'daniel_1949' into next
Merge branch 'next' into sam_alt_separate_files