Merge: partial from trunk revision [3094/trunk/ORCHIDEE]. Only point 4.
It was already merge in [3305/perso/albert.jornet/ORCHIDEE-MIC-GLUC-GM31] by Chao.