Merge branch 'main' into 557-reveal-button-in-key-permissions-is-not-working