It does fail when I add @NaturalId - just missed that. I pushed updated test that illustrates the problem.