Merge pull request #658 from MrPetovan/task/5410-remove-dbm-class