Merge pull request #6023 in master
Remove duplicate comment
Merge pull request #6030
Merge pull request #6030 in develop
Merge pull request #6030 in master
remove double semicolon
Merge pull request #6031
Merge pull request #6031 in develop