different error code for server errors
Merge branch 'packaging' into packaging-ATMOSPHERE