Synchronize / fix @inheritDoc tags.
Merge pull request #3396 from ADmad/3.0-inheritdoc

Synchronize / fix @inheritDoc tags.