MM 2.0 Feature / Bugfix