Merge changes from v2024dev1 to v2024dev2
Some changes were merged to v2024dev1 just after the repository was branched for v2024dev2. Merge these changes in to v2024dev2.
Signed-off-by: Martyn Welch martyn.welch@collabora.com
Some changes were merged to v2024dev1 just after the repository was branched for v2024dev2. Merge these changes in to v2024dev2.
Signed-off-by: Martyn Welch martyn.welch@collabora.com