Resolved merge conflicts (Cecile-Hardi)