2c1a590752
(cherry picked from commit 7b476c19c2)
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>