Signed-off-by: Dave Henderson <dave.henderson@grafana.com> (cherry picked from commit c9741a5e0c) (cherry picked from commit 09236bb134f428a893dcadd0efa715cecf76140e) (cherry picked from commit b564a9770ace0954418d48eac322249f7c138146)
c9741a5e0c