7e89ef052a
(cherry picked from commit 91fd0223a4)
Co-authored-by: George Robinson <george.robinson@grafana.com>