Merge branch 'master' into develop
Remove uneeded property.
Merge branch 'develop'
Release: v1.14