Merge pull request #7327 from mpg/entropy-md-light

Entropy: use MD light