/!\ Commit from osur prod

Some modifs from osur production