79fd17c22a
(cherry picked from commit c636685ca2)
Co-authored-by: George Robinson <george.robinson@grafana.com>