Fix ignored docblocks
add methods
Merge pull request #3255 from Youpie/4.1

Fix ignored docblocks
Merge branch '4.1'