Merge pull request #3221 from Borromini/mii-tool