Merge pull request #5106 from senivam/3x_merged