Merge pull request #1025 from webdetails/5.0

Cherry picks