(cherry picked from commit acd02e8a48) Backport of https://github.com/grafana/grafana/pull/68218
acd02e8a48