This one is tough to fix. There is an "easy fix", but that causes the inheritance entity to not be batched effectively. I added a tests for this with @FailureExpected to investigate more.