second commit for #2566 merged as a single commit
revamp
2018-08-06, Edouard Tisserant