local is not explicitly set to false
Merge branch 'develop'