Merge "Add logging for endpoints.json"