Issue #3566576: Added chart fwa

Shivam Senrequested to merge
issue/ai-3582764:3582764-remove-duplicate-entries into 2.0.x

(cherry picked from commit 61c9232c)

Closes #3582764

Merge request reports