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