Merge pull request #4771 from senivam/3x_merged

master merge into 3.x