close som6 branch before merge
som6
2021-04-09, Edouard Tisserant