Merge "Fix problems with early ending of Sequencer"