@Cristian Placintar, have you verified whether this still continues to be problematic in ORM5? If not, I'll try to spin up a test case and verify it this week.