Thanks Felix Farquharson for the report and Claude Paroz for the
review.
Regression in 40b5b1596f7505416bd30d5d7582b5a9004ea7d5.
Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>
Backport of 3fad712a91a8a8f6f6f904aff3d895e3b06b24c7 from main.
Bug in 4971a9afe5642569f3dcfcd3972ebb39e88dd457.
Thank you to kazet for the report and Claude Paroz for the review.
Backport of 99dcc59237f384d7ade98acfd1cae8d90e6d60ab from main.