6dce936b65
(cherry picked from commit b370a8e366)
Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>