Merge pull request #1432 from Yann-lms/mmc_framework