Merge pull request #1753 from Yann-lms/emmc_ret