Merge branch 'hotfix/unused-code'
Blackhole cache adapter : docblock corrections
Merge pull request #6000
Merge pull request #6000 in develop
Merge pull request #6000 in master
typo on comment fixed
Merge branch 'hotfix/#6003-docblock-typo' into develop

Close #6003
Forward port #6003