Merge branch 'main' into fix/1036-headless-login-hint