UPDATE (9th July):
after Andi's first set of changes, Client at least works:
However other entities still show "Base Entity":
for the Instruction class which would seem to have the same inheritance hierarchy as Client. Very odd !
In addition (this might be a different issue), we don't seem to have a tooltip for the icon to navigate to an object in a table:
The "Base Entity" should instead say "Client.