DB fix, and some step 2 fix
Merge branch 'master' of https://github.com/fomin-stas/rgu