Merge pull request #5667 from jansupol/m317a

Merge 3.1 into 4.0