Merge "modify status code according to the latest API documentation"