Eng 6428 - Review only.wait for merge till System tests have run.

If it's popping the empty segment here, what does the `peek(true)` do above?