Update Tahoe Juniper (main) with changes from hawthorn/main

[github-actions]

This is an automated pull request from branch hawthorn/main (Hawthorn) into main (Juniper).
This is meant for making sure all of our Hawthorn changes gets merge into Juniper otherwise Juniper would stall.
If tests passes merge this pull request.
If there are merge conflicts, it needs to be resolved manually in a seperate pull request.

[OmarIthawi]

Needs to fix conflicts: https://appsembler.atlassian.net/wiki/spaces/ED/pages/1750959167/Resolve+git+conflict+for+automatic+GitHub+pull+requests?search_id=d92c7a0e-c3eb-4b71-b157-50a9ea6c99b6

[OmarIthawi]

@shadinaif this is one of the cases where intricate git work is needed. I think it's a good oppurtunity for us to test the playbook we wrote a white ago:

• https://appsembler.atlassian.net/wiki/spaces/ED/pages/1750959167/Resolve+git+conflict+for+automatic+GitHub+pull+requests?search_id=d92c7a0e-c3eb-4b71-b157-50a9ea6c99b6

Does this look like a good addition to the next sprint you have?

cc: @melvinsoft

[shadinaif]

Yes @OmarIthawi , Thank you, I'll add a task for it

[melvinsoft]

.

[melvinsoft]

.