Fix entity usage integration

Artem Dmitriievrequested to merge
issue/insert_view_adv-3637937:3637937-entity-usage-fix into 2.0.x

Closes #3637937

Merge request reports