Better typehinting

Alex Pottrequested to merge
issue/entity_usage-3605886:3605886-nulls into 5.x

Closes #3605886

Merge request reports