Buffer_size return not working.
Merge remote-tracking branch 'origin/echo' into echo