Merge "Fix bugs in Sequencer"