Merge develop.

Doc work in progress.