Merge pull request #4536 from TranceLove/feature/4488