(cherry picked from commit fa5a304de8) Co-authored-by: Gareth Dawson <gareth.dawson@grafana.com>
fa5a304de8