5342f5e713 Follow up to 38e63c9e61. Backport of 2eb1f37260 from main
5342f5e713
38e63c9e61
2eb1f37260