As far as a test case, I provided the sql scripts in use, but it should be possible to potentially reproduce this. I am attaching the updated file set that seems to work.