[slack-22.0]: CI backports from release-22.0.2
#744
Closed
slack-22.0]: CI backports from release-22.0.2
#744