Merge "Unify error/status codes"