Update metadata
Merge branch 'develop'