fixed auto update
Merge branch 'dev-logic' into dev