Merge branch 'hotfix_attestation_impossible'