OK, you know your stuff and I think you are spot on, with water containment you need to use everything at your disposal, so in my case, I should have hoped the builder used aqua panel, membrane, epoxy grout and adhesive!
But I suspect they didnt use the membrane, just my hunch.
So should...