MDL-40230: BACKPORT Improving PHPDoc