updated to reflect 2.11.0 milestones and RC1