Merge pull request #4830 from senivam/3x_merged

merge of master into 3.x