Merge "Database class parameter and documentation cleanups"