Doc-gen updates