Fixed depenencies and using(db_alias)
Merge branch 'master' into kingman