Merge branch 'la/init-doc' into jch