Merge OCC22357 and replacing french comments by english one