Merge pull request #5367 from senivam/30_merged

merge of the actual 2.x into the 3.0 branch