Merge pull request #1398 from gilles-peskine-arm/feature-opaque-keys-2.7.1

Merge 2.7.1 into feature-opaque-keys