Merge pull request #5543 from jansupol/m242b

Merge 2.x into 3.0