Merge changes from default into svghmi branch
svghmi
2021-02-24, Edouard Tisserant