Forward port from v2024dev1 to v2024dev2

Forward port the below MR's from v2024dev1,

!584 (merged) !581 (merged) !577 (merged) !572 (merged) !571 (merged) !565 (merged)

https://phabricator.apertis.org/T9521