Fix refs and dependencies in updater logic
Merge branch 'release-1.0.0' into develop