Merge pull request #5583 from senivam/30_merged

merge of the actual 2.x into 3.0 branch