(cherry picked from commit 7fe95de2)
Co-authored-by: Sebastien Masson smasson@locean.ipsl.fr
close #603