Allow setters on some propoerties.
Merge branch 'develop'