[29.x] More backports

Coverage report

- Select -

Pull request run

Report ID undefined

Commit undefined

Step Functions execution ARN Not available

Coverage batch job ID Not available

Base master run

Report ID Not available

Commit Not available

Step Functions execution ARN Not available

Coverage batch job ID Not available