Merge pull request #4747 from senivam/3x_merged

Merge of actual master into 3.x branch