Merge branch 'release/1.4'
1. increase buffer size
merge conflict