dataBuffer update
pr5040 Update