b051551f4d
Co-authored-by: Jean-Philippe Quémémer <jeanphilippe.quemener@grafana.com>
(cherry picked from commit 67290aa49f)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>