Follows up on HSEARCH-3581 Pull Request Sent
It may already work, but I couldn't test it because of what looks like bugs in ORM.
We should investigate, fix the problems and correctly test these use cases.