Merge branch 'db/rev'