Merge + fixed parent estimates.

Signed-off-by: Tushar Narayan <tusharnarayan@gmail.com>
Merge remote-tracking branch 'origin/team1-tablevalidate' into team1-tablevalidate