Merged search in CTN branch

2019-03-22, Edouard Tisserant