U/salnikov/dm 621

If it does not, then we should tweak the db module, nobody ever claimed db module is complete/done.