am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"

* commit '1e8a57c212d26c41325e950ed629244071acc326':
  Avoid jumps to faulty position after seeks