suspend automatic update on database rebuild
Merge branch 'dev'