Entropy integration complete.
Commit for Priya
Merge remote-tracking branch 'origin'