Merge "align MME" into release-1.1.0