(cherry picked from commit 179f35a537) Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
179f35a537