Merge "Expand error codes in messages"