Merge pull request #5559 from jansupol/m242c

Merge 2.x into 3.0