re #9601 done up to and including MergeCalFiles