Merge "Improve Database related documentation a bit"