Merge "Add/update phpdoc"