[4.2] Docblock fixes