Bugs like this require redesign of a significant chunk of persistence layer, as fetching the root object (in non enhanced mode) will fetch almost all optional one to one relationships.

In enhanced mode flow itself is broken.

Would appreciate if you can let me know whether this item is in your radar or not. If not, when you think this might be taken up