[4.2] Database Docblock Fixes