Trying to fix issue #58, no success
Attempting ot resolve issue #58, still no success; but getting closer; CleanupMergeDatabaseFilesScenarioTest / testIssue58_2 produces a very similar problem
Cont'd debugging #58, no success :-/
Cont'd testing for issue #58
Cont'd #58, no success; leaving it here for now.
Merge fix-issue-58 branch into issue-58