merged Andrey's default

2018-08-08, Edouard Tisserant