[devel] alignment with the latest version from Terradue