Merge pull request #4793 from jansupol/3x.merge

3x.merge