Merge pull request #1282 from gilles-peskine-arm/merge-3.6-restricted-20240823

Merge 3.6 into -restricted