Issue #3348160: Port to 5.x

Adam Bramleyrequested to merge
issue/entity_usage-3348160:3348160-5.x into 5.x

Closes #3348160

Merge request reports