beremiz

Merge.
mc9_backport_2
2021-03-03, Tomaz Orac
3deb6d2b60b8
Merge.
/**
* No platform specific code for "Generic" target
**/