6e86f5dcf7
(cherry picked from commit 2b2c09b8d5)
Co-authored-by: George Robinson <george.robinson@grafana.com>