Merge "block: Fix PHPDoc comments to match function signature (or method)"