(cherry picked from commit 486b358d)

Backport of #70000

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>