Cherry pick from RR.
changed milestone to %2.2.11
merged
mentioned in commit 88667400
added Uncapped label