(cherry picked from commit caeda94e)
Co-authored-by: Sebastien Masson sebastien.masson@locean.ipsl.fr