Merge remote-tracking branch 'origin/master'
[Update]:update buffer code.