Update doc

Trivial self merge