f9a7ad06d7
(cherry picked from commit 59e153cde8)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>