Merge pull request #1026 from webdetails/5.0-CE

Cherry picks