Merge branch 'refs/heads/t/simple_error_codes'