Bagging: Second set of changes.
Merge branch 'master' into prakhar
Merge branch 'prakhar'