Merge in private cs changes back into public docs