🍒 Merge changes from PR #1058 to

[github-actions]

Automated PR to merge changes from develop to

I failed to cherry-pick the changes automatically because of the following:

fatal: bad object ac2a17f49b41f8a8ecd0f4d3a06bd3ddd5aa1921

To continue manually you can use these commands:

git fetch origin auto-pr--1058-7881:auto-pr--1058-7881
git fetch origin fix/birth-e2e-test-missing-id-changes:fix/birth-e2e-test-missing-id-changes

git checkout auto-pr--1058-7881
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick ac2a17f49b41f8a8ecd0f4d3a06bd3ddd5aa1921