Updated docs from merge