Merging with work done in smb111-regroupement-1