Merge "Return the size of the buffer for validation" into main