Merging enrico-inprogress with anurag