beremiz

Merge changes from default into svghmi branch
svghmi
2021-02-24, Edouard Tisserant
7cf38cd0d820
Merge changes from default into svghmi branch
/**
* No platform specific code for "Generic" target
**/