Merge "Replace DatabaseBase:: with Database:: and update type hints"