Fix mismatches between the PHPDoc and the method signatures
Merge branch 'hotfix/3827' into develop

Forward port #3827