Rights correctly defaults to the current rights
Merge branch 'develop'