Merge branch 'cherry-pick-d9e1b6eb' into '21.0'

Merge branch 'master-my-topic2' into '21.1' -- push to 21.0 (Fix out of bounds reported in ATR-16445)

See merge request !2722

Former-commit-id: a01810dff47fe7bb6220c37c02dc33db63ba93f8