Import last developments from Nadir in ExoValDev_73X after merge of Thiago_73X.