phpdoc fix in process
Merge branch 'phpdoc' into develop
Added support for extra extensions with Extra namespace
phpdoc fix in process
Merge branch 'develop' into phpdoc