Merge "NewBufferCount'value changed:simplifying the steps of applying for new buffers" into main