Backport fixes and remove RootGrid