[slack-22.0] ci backports from release v22.0.2
#745
Merged
slack-22.0] ci backports from release v22.0.2
#745