Merge pull request #1283 from gilles-peskine-arm/merge-2.28-restricted-20240823

Merge 2.28 into -restricted