Update db according to milestone
Merge branch 'master' into milestone