What this PR does / why we need it:
Which issue(s) this PR fixes: Addresses but does not fix #11598
Special notes for your reviewer:
grafana
