soleil/master merge 1.2.0 (seb)