Merge pull request #1058 in master
Fix mistake in comment
Fixed inconsistency
Merge pull request #1062
Merge pull request #1062 in develop
Merge pull request #1061
Merge pull request #1061 in develop