[GIT PULL] Optimize the line buffer mode