Merge pull request #6023 in master
Remove duplicate comment
Merge pull request #6030
Merge pull request #6030 in develop