Process error codes and render message translations
resolve conflict from upstream/master