@cgmonroe's fix

Alex Pottrequested to merge
issue/entity_usage-3592109:3592109-link-plugin-does-5.x into 5.x

(cherry picked from commit 490836d5de2cc911a581058d6b76ad8fe5d243de)

Closes #3592109

Merge request reports