Merge "Refactor lookahead ring buffer"