First tenative implementation of error message change
Merge branch 'gchpaco_1600' into next