[Issue 10458] improve handling of large entry modifications