Pulled latest changes from sandeep.