Merge "Update PHPDoc comments"