(cherry picked from commit 789cfc31e3) Co-authored-by: George Robinson <george.robinson@grafana.com>
789cfc31e3