(cherry picked from commit 7599ab8217) Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
7599ab8217