Merge "HttpError: Convert line breaks in text message to <br>"