Resolve the issue with MergeUpperLimitsGrid that is causing problems when handling large numbers of files.
No changes between master and master