Auto merge of #7203 - flip1995:beta, r=llogiq

Backport #7170 to beta

changelog: none (fixes stack overflow, but this was introduced in this release cycle)
This commit is contained in:
bors 2021-05-10 10:14:38 +00:00
commit 72be4764c5

Diff Content Not Available