c179225efe
backport https://github.com/grafana/grafana-private-mirror/pull/894 to 9.5.x
backport https://github.com/grafana/grafana-private-mirror/pull/894 to 9.5.x