Merge branch 'dk/raise-core-deltabasecachelimit'