Backport v2024dev1 <- v2024dev2: Sync changes

Since the rebase will use v2024dev2 as target branch v2024dev1 will be used development branch so sync them to have the latest version.

https://phabricator.apertis.org/T9521

Signed-off-by: Walter Lozano walter.lozano@collabora.com