Fix MCCP bug caused by improper buffer management.
Merge branch 'release_30' into release_31

Fix MCCP bug caused by improper buffer management.