Merge pull request #5769 from senivam/31_merged

merge of the actual 3.0 into the 3.1