beremiz

merge default

2022-05-17, Edouard Tisserant
eadb3a85ceb7
merge default
/**
* No platform specific code for "Generic" target
**/