Database doc changes to address #2412 and #6451.