Merge pull request #5779 from senivam/40_merged

merge of the actual 3.1 into the 4.0