Merge pull request #5890 from jansupol/merge2x250401

Merge 2.x into 3.0