Merge "Use IDatabase type hints in /maintenance"