Merge branch 'feature-claiming-certificate-transfers' into staging