Merge "Removed unused diff buffer"