Complete merge from Pierre-Yves