Merge "Capping buffer size to std::numeric_limits<size_t>::max()"