Merge pull request #11570 from aleksander0m/aleksander/mm-1-12-8