Merge pull request #1058 in master
Fixed inconsistency
Merge pull request #1062
Merge pull request #1062 in develop