Merge dev-feature-database-backend

Include database backend features in dev branch.