Merge pull request #9475 from gilles-peskine-arm/framework-update-20240813-3.6

Update framework to the head of the main branch