Merge "Bug-1809: Fix GracefulCapabilityHandler."