limit xtra buffer allocation
Merge pull request #6667 from amitmurthy/amitm/alloc

limit xtra buffer allocation