Fix ORM many-many
Merge commit 'c047c579086846f5c2b8528ad19d9a9fd3326206' into framework