Merge from default
svghmi
2020-07-03, Edouard Tisserant