@Vlad, your linked test case does not use @MapsId.
I am quite confident in what I saw, but I will try to modify your test case to verify my observation.