96ae3b7e45
(cherry picked from commit 2f85172718)
Co-authored-by: George Robinson <george.robinson@grafana.com>