Use FQN in docblocks.
Clean up
Merge branch '3.0' into 3.0-connection-prefix