database_tasks changes from a17fd556b191893b6a8d62318b549351fa0924f5