Merge branch 'coloquinte_rebase' into devel

Some merge conflicts did occurs as it seems the latests commits
from "devel" where not applied to the rebase.
This commit is contained in:
Jean-Paul Chaput 2023-07-09 13:42:21 +02:00
commit d258749373

Diff Content Not Available