Fixes #3714
Fixed failing test from previous commit
Trying to fix flaky test on postgres
Merge pull request #3717 from ADmad/3.0-api-docs

Fix api docblock CS errors for View/
More api docblock fixes.