Hhh 8683 EntityEntry backport

@sanne @gunnarmorling can you check this one out ?