Merge `master` into `vthree-rethink` so we have the new docs

Merge `master` branch into `vthree-think` so we're able to update the documentation which will need updating for v3.