Merge: from revisions [3923:3931/perso/jinfeng.chan/MICT_JC]. GRM update. Done by Jinfeng
This modifications include: