Fix docs
Merge branch 'doc/forward2'