Merge "Changed some DatabaseBase type hints to IDatabase"