Merge "Bug fix - Update http response code"