Some doc blocks fixes
Use self keyword to fluent interface in docblocks
Merge branch 'hotfix/4649'

Close #4649
Merge pull request #4650 from neeckeloo/fix-filter-doc-blocks

Some doc block fixes
Merge branch 'hotfix/4650' into develop

Forward port #4650