Don't merge empty objects
Merge branch 'develop'
Update dependencies