Problems with repeats on DS (with and without Cantai)

I have a score that includes several repeated sections. For the song form to work, all the repeats need to be honored on D.S. And I have that option turned on in the Play options.

What actually happens is that the main song plays up through the D.S. After going back to the sign, the repeat at 2-3 is honored. But after playing m7, it goes to the second ending. In other words, the first repeat is honored, but the second is not.

Then when we add the element of Cantai, even the first repeat is wrong. On D.S. Cantai sings “Just a little sam” twice instead of using the second line of lyrics. Cantai sings it correctly before the D.S..

So, I think there are two problems here: one a Cantai/Dorico integration problem and the other being a bug in Dorico. I think the repeat blocks and m12 and m16 contribute to the problem. If I remove them, then the repeat at M7 is honored.

I would be happy to upload the project and/or the audio render, but they are large. I don’t think it would be useful to send it with the Silence template applied.