merged Sergeys changes

2018-03-02, Edouard Tisserant