Merge multi-file support from aMoniker