fix vendor extensibility issues
This work is funded by the European Commission through the project ENVELOPE with Grant Agreement number 101139048.
Edited by Stavros-Anastasios Charismiadis
This work is funded by the European Commission through the project ENVELOPE with Grant Agreement number 101139048.