[release-2.6.x] Backport #6413 and #6377 to k102#6492

Merged

vlad-diachenko merged 1 commit intorelease-2.6.xfrom backport-6422-to-release-2.6.x

Jun 24, 2022

+88-28

Commits on Jun 24, 2022

Backport #6413 and #6377 to k102 (#6422 )

JordanRushing
authored and
grafanabot
committed