Merge "Move DatabaseBase to a class alias for type-hints"