Includes the Comments from the upstream