Merge "Update formatting for includes/diff"