c4c9ca47da
(cherry picked from commit 624a3240f0)
Co-authored-by: George Robinson <george.robinson@grafana.com>