Improve buffer_sequence
[FOLD] basic_session
[FOLD] basic_session