better plausi for table_per_entity inheritance
Merge remote-tracking branch 'refs/remotes/upstream/master'