Backport #696 to lts/1.20.1. Currently don't have time for this so someone else can have a look

Given we no longer officially support 1.20.1, I'll close this task - if any community member is willing to do this, we will still accept a pull request.
Thanks :)