Merge "Improve performance of updateDataLeaves"