Merge ring-buffer/for-next