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