Merge pull request #5305 from gilles-peskine-arm/test-missing-ret-check-202112-development

Missing error checks + test bug on unlikely failure