Merged e3a1cfb (circular buffer)