Remove unused variable
Merge pull request #5151 in master
Merge pull request #5171
Merge pull request #5171 in develop