Big merge with Snapshot 2.8 of dCache.