Merge pull request #10746 from aleksander0m/aleksander/mm-1-12-2