norme
norme + deleting error messages
Merge branch 'release/1.1' into develop