Merge changes to public. 

Post directly to git cvenky henceforth