Resolve #3555984 "Content metrics improvement"

Luis Ruiz Peidrórequested to merge
issue/xray_audit-3555984:3555984-content-metrics-improvement into 2.x

Closes #3555984

Merge request reports