c5aaf9526e
(cherry picked from commit 5f16e4cedc)
(cherry picked from commit 37ac299853b27ff819d16085630f425fc30c794e)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>